From 71fd75785922beb5d83567a6f2e32a17d0fa7c2f Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Sun, 3 Jul 2016 13:15:47 +0000 Subject: [PATCH] Update alignof patch --- debian/changelog | 3 ++- .../04_Fixed-OFoptional-by-introducing-OFalign.patch | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index b810f9d4..c39cc593 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -dcmtk (3.6.1~20160216-2) UNRELEASED; urgency=medium +dcmtk (3.6.1~20160216-2) unstable; urgency=medium * d/p/08: remove SYSTEM_PROCESSOR usage for reproducible builds * d/p/09: add patch to enable compileing against openssl-1.1 Closes: #828281 + * d/p/04: update patch to remove duplicate entries -- Gert Wollny Thu, 26 May 2016 15:47:40 +0000 diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch index c03769dc..84d18e38 100644 --- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch +++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch @@ -19,19 +19,10 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign? --- a/CMake/osconfig.h.in +++ b/CMake/osconfig.h.in -@@ -1137,4 +1137,16 @@ +@@ -1137,4 +1137,7 @@ /* The path on the Android device that should be used for temporary files */ #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@" -+/* Define if the compiler supports __alignof__ */ -+#cmakedefine HAVE_GNU_ALIGNOF -+ -+/* Define if the compiler supports __alignof */ -+#cmakedefine HAVE_MS_ALIGNOF -+ -+/* Define if the compiler supports __attribute__(aligned) */ -+#cmakedefine HAVE_ATTRIBUTE_ALIGNED -+ +/* Define if the compiler supports __declspec(align) */ +#cmakedefine HAVE_DECLSPEC_ALIGN + -- 2.30.2